Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Barrels #1776

Merged
merged 66 commits into from
Dec 21, 2024
Merged

Barrels #1776

merged 66 commits into from
Dec 21, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Aug 2, 2024

About the PR

Added barrels to all wrecks, containing a big selection of regents, from chems to ketchup.
Added the more hard to get chems to cargo, but with a costly price to anyone that want to skip trading or finding them.

Barrels contain 1000u of liquids storage and have the same shape as an air canister.

Why / Balance

More ways to obtain chems.

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

N/A

Changelog
🆑

  • add: Added barrels of chems, oil, water, fuel, booze, etc. to wrecks, rare chems to cargo.
  • tweak: The ChefVend now contains one jar of each oil.

Copy link
Contributor

github-actions bot commented Aug 2, 2024

RSI Diff Bot; head commit b3bdf9d merging into 7699f22
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi

State Old New Status
closed Added
icon Added
open Added

Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi

State Old New Status
icon Added
icon_open Added
metal_explosive_label Added
paper Added

Edit: diff updated after b3bdf9d

@dvir001 dvir001 marked this pull request as draft August 2, 2024 23:22
@github-actions github-actions bot added the FTL label Dec 16, 2024
@whatston3
Copy link
Contributor

Added barrels to wrecks. The spawn rate seems fine to me, they aren't super common. I've replaced the tank spawner in favour of the barrels (why not, local flavour) - high cap still exists, but is a lot less frequent (still about 20% more frequent than it was).

Added separate spawners for chem-y stuff (ethanol, iodine), less chem-y stuff (diethylamine, mayo),drinkables (water, absinthe), and a dedicated empty spawner.

Unless you want these on vgroids, this seems acceptable to me. Shouldn't be absolutely tripping over chems, but you should find maybe a few barrels, mostly of chemical stuff, per wreck.

@whatston3
Copy link
Contributor

Anyways, pending further goofs, I'll give this a soft approval - double check when you can, let me know if I missed anything dumb.

Paper labels are working as they should.

@whatston3
Copy link
Contributor

Also, so I don't forget, might recommend increasing the cargo price on the barrels by about 2-5x, should foster player sale, and 5 speso per unit isn't exactly pricy.

@dvir001 dvir001 changed the title Barrels (WIP) Barrels Dec 17, 2024
nothing final but should be good for first merge
@dvir001
Copy link
Contributor Author

dvir001 commented Dec 21, 2024

@whatston3 Its done, merge when you think its good.

@whatston3
Copy link
Contributor

Reduced the oil jug count to 1 of each in the ChefVend (restocks now available via barrels).
Removed chem crates (preferring barrel restocks - I do think there isn't much harm in having them all available apart from filtering, but I'll leave the rare-only ones as-is for now).
Changelog updated.
Price might need work but I do think that the current values enable player arbitrage, which is good.

@dustylens
Copy link
Contributor

Is #2453 largely obsolete now?

@whatston3
Copy link
Contributor

Is #2453 largely obsolete now?

Yes, if this PR is more or less acceptable as-is.

@whatston3
Copy link
Contributor

Works alright, Liquidator's fine.

Curious to see how this lands.

Will merge #2453 and this once tests pass.

@whatston3 whatston3 merged commit d198d11 into new-frontiers-14:master Dec 21, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Dec 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants